Added && and || to booleans
Merge branch 'master' of https://github.com/landakram/hopper