Added backwards compatibility, tests and it finally works
travis