sstone Merge pull request #78 from adam-zacharski/patch-1