Transfer
Merge branch 'master' of https://github.com/TimeToogo/Storm into dev
Transfer
Merge branch 'master' of https://github.com/TimeToogo/Storm into dev
Merge branch 'dev' of https://github.com/TimeToogo/Storm into dev
Added better exceptions