Final changes to prepare for back-merge to public fpm
Merge pull request #22 from gerbercj/feature/backmerge_of_sh

Feature/backmerge of sh