merging in
Merge branch 'master' of https://github.com/rydrman/DS3-WorkInProgress