reset master
Merge pull request #2 from chrysa/master

reset master