Bugfixes (Issue #10)