start adding python-based unit tests to make bugfixing easier
Merge remote-tracking branch 'origin/master'