test
Merge branch 'master' of https://github.com/PySimulator/PySimulator
Fixes #14
Merge branch 'master' of https://github.com/PySimulator/PySimulator