Issue #153
Merge pull request #154 from Phyks/dev

Issue #153