Bugfix #10

Fix issue #10