close #50, bumped up version
Merge branch 'release/0.8.4-bugfix' into develop