updated implementadion, added tests
Merge branch 'master' of github.com:ernado/cymedia