fixes testing failure - all tests pass
Merge branch 'master' into testing_like_crazy
Merge pull request #40 from nullet/testing_like_crazy

Testing like crazy