Moved changes to dev
Merge pull request #487 from mythern/dev

Workaround for #336