first version finished
Merge pull request #1 from RockKeeper/master

first version finished