changed v1
Merge branch 'master' of https://github.com/400yk/watttime