updated
Merge branch 'master' of gh:jintonic/dots