Resolves #403

Thanks @kotoroshinoto for the help!
Merge pull request #412 from Kittychanley/master

Resolves #403