Merge pull request #336 from jpecht/master

pilt profiles addition / various fixes
Merge remote-tracking branch 'upstream/master'