fix for issue #3
issue #10 fix
Merge branch 'issue-#10-fixes'