added support for "or" functionality and refactored code.
created nothing method to return correct state of the values. formatted code.
Merge remote-tracking branch 'origin/master'