reset master
Merge pull request #3 from chrysa/master

reset master