Removed Nested OR statement.  More commits are made, however performs as expected. (Issue #91)