[Fix #111] Rename boolean functions
Fix style
Merge branch 'origin/master'