initial commit
squished master over into dev
Merge branch 'dev'