Merge pull request #49 from cptmashek/master

Merged updates, reverted barf usage.