slight refactoring, bug fix
ignoring specific tests
merging master into branch