getting paul's stuff
Merge branch 'dev'