It should fix #325
It should fix #285
Merge pull request #337 from z4r/develop

It should fix #285 and #325