@ahrvoje
ahrvoje some special cases, clean up, more tests
Latest commit 906a955 Aug 17, 2017