Fixes specs in Travis
Merge branch 'develop' into reader_prefixes