One shot mode support
Update
Update version number
Merge branch 'develop'