Resolves CTDA-20
Merge branch 'master' of github.com:umdsp/romeu
Resolves CTDA-20 and CTDA-4