Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Update setup.py
Bugfix
Fixup
One shot mode support