update
Merge pull request #3 from whiperhack/master

update