davidsiaw Merge pull request #38 from shybovycha/patch-1