Merge pull request #43 from tsheasha/develop

Develop
Fixed onboarding