test updated, all tests pass
Merge branch 'master' of https://github.com/asgerhallas/combojs