Merge pull request #5 from lbrabbit/master

v029 added