Merge branch 'master' of https://github.com/dansoah/D1000
Merge branch 'master' of https://github.com/dansoah/D1000