Merge pull request #3 from schryer/master

Small refactor.
Merge remote-tracking branch 'upstream/master'