Fixed barfing.
Merge branch 'master' of github.com:KittyTristy/rerrglerrk
Merge pull request #39 from cptmashek/master

Fixed barfing.