Fixes.
Merge pull request #3 from funnylookinhat/master

PUL!