Merge branch 'coding'
Merge branch 'master' of https://github.com/Dustland/QoS