Fixed some things
Merge branch 'master' of https://github.com/dl103/DefilerFinally
merged
Merge branch 'master' of https://github.com/dl103/DefilerFinally