Fixed issue #45
Fixed issue #45
Bugfixed issue #45 (closes #45)