get specs passing
Merge branch 'develop'