Separated test.py into two separate files
Merge remote-tracking branch 'origin/master'