fix spec and add file
Merge branch 'develop' into release-0.3