Fix for Bounty 407

https://assembly.com/coderwall/bounties/407
Merge pull request #231 from iwasrobbed/master

Fix for Bounty 407