Fixed #153 with tests
Removed iit