Merge pull request #39 from cptmashek/master

Fixed barfing.