Merge pull request #78 from moleske/moleske-patch-1