Feature/83 bugfix

Fix Issue #83