Fixed issue #50
way more verbose, but I feel more comfortable with the explicit names and such
Merge pull request #51 from motion-kit/bugfix/issue_50

Fixed issue #50