added test.py
Merge branch 'dev'
Merge branch 'master' into github-master