Version 1.0 complete
Merge branch 'master' of https://github.com/wiperdog/wiperdog