Merge branch 'dev'
Merge branch 'dev'
My squashed merge of 'dev'
Referencing Issue #1
closed #1
fixed #1
Merge branch 'master' into dev