Second Commit
Merge branch 'master' of https://github.com/delta-G/disco_doser.git