Merge pull request #42 from bwhacks/logic-fixes