Improve folsom stuff
Merge pull request #101 from MirantisDellCrowbar/feature/folsom/master

Improve folsom stuff