Merge pull request #121 from wseyler/dev

Fix of yesterdays pull request.
No working changes to the test