Added new rockspec
Merge branch 'develop'