Issues/11

Fix for Issue #11