Broken logic fix
Merge pull request #19 from word/master

Broken logic fix