fixes
poor commit
tests...
before merge
19.02
19.02 without .idea
merge