Merge branch 'local_v1'
Merge branch 'master' into local_v1
Merge pull request #4 from manchesterfish/local_v2

Local v2