Hotfooting a few things
Merge branch 'hotfix/v1.0'