Using integer instead of bool
Merge branch 'release/0.6.1' into develop