JK now the bug should be fixed
Merge pull request #146 from heierj/develop

JK now the bug should be fixed