fixing startup issue
Merge branch 'hotfix/startupIssue'
Merge tag 'startupIssue' into develop

0.1.11