Missing && typo
Merge pull request #1201 from byteGator/Missing-&&-

Missing && typo
wip
Merge branch 'develop' into testing
some fixes on tests
Merge pull request #1202 from conejoninja/testing

Testing