Bugfixed issue #48 (closes #48)