change bool() method
changed main
merge with a branch feature