Temp commit
Merge pull request #2 from hunner/fix-acceptance-tests

Temp commit