Merge pull request #211 from techtonik/patch-1