Merge pull request #203 from johtso/patch-1