barf fix
Merge pull request #153 from cptmashek/master

barf fix