fixes #5, some minor bugfixes/improvments (v0.5.0)