Fixing barfness
Merge pull request #46 from cptmashek/master

Fixing barfness