Fix #2
Patch 2
Merge branch 'patch-1' of https://github.com/rellder/test