Fixed boolean return values.
Commit after merge