Fixed #42
Merge branch 'patch-2'