fixed #27 #29 #30 #31, higher test coverage, stabilized tests,
Merge remote-tracking branch 'origin/master'