Remove warning about bitwise operators
Merge branch 'dev'