Merge pull request #24 from mktums/patch-1