Fixed the bug for real
Release 1.5.2
Merge pull request #19 from dapil/dev

Dev