Fixes 2.
Merge pull request #4 from funnylookinhat/master

PULL!