Test for Issue #34
Merge branch 'rc_1' of github.com:ciberch/mirror-api into rc_1