Final boolean fixes
Merge pull request #25 from JonKoenes/master

Final boolean fixes