Merge pull request #22 from nbd168/master