edit some code
Merge pull request #8 from encal/master

edit some code