Bugfixes

Fixed #1 and #3