Merge pull request #161 from Adron/master

Fixed the test on the *test* server.
Merge branch 'test'