Merge from Sunday's Commit between Dell & TONY disk
Merge branch 'master' of https://github.com/ourochan/secret