Merge pull-request #28 from nojb