Testing/develop

This is precisely the same as PR#61. The last commit was amended with no changes to trigger another build.