Bugfixes

fixes #3
fixes #4