Merge pull request #40 from nojb/master