hotfix init
Merge pull request #78 from clayg/master

init fix
Merge branch 'master' into develop