Add guard and rspec
Merge branch 'develop'