Added tests
Added tests
Merge branch 'master' of https://github.com/j4v/pyProjects