Fixes issue #25
Merge remote-tracking branch 'upstream/master'
Merge pull request #30 from ericpoe/master

Fixes #25