Merge pull request #1 from lockrecv/feature/exception

New exception
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #2 from lockrecv/develop

merge dev
Merge branch 'develop'
Merge branch 'develop'