Merge tag '0.1.1' into develop

0.1.1
Merge tag 'startupIssue' into develop

0.1.11