Bugfixes

Correction of issues #1 and #2