Fixes #45 - misssed else block
Merge branch 'issue-45'