Initial commit
Merge branch 'release/refactor-rspec' into develop