392 1wheel
Merge pull request #31 from 1wheel/392

Merging @1wheel's solution for #392