Fixed issue #2
Fix for #1