This fixes #360 and #356 and #355 and #353
Merge pull request #365 from mitchmindtree/master

This fixes #360 and #356 and #355 and #353