Fixed a hangup-bug
Merge branch 'hotfix/hang_test'
0.03