added some tests to be implemented
Merge branch 'master' of github.com:benizebe/salo