Merge pull request #15 from adsj/master