Merge pull request #6 from hgolsen/CRA-505

Cra 505
Merge branch 'CRA-505' of git://github.com/CRAVA/crava into CRA-505