improvements + Fixes #90