simplify code (remove useless code)
add tests
add new files.
Merge branch 'master' of github.com:dreamtools/dreamtools