Merge pull request #26 from WinterBall/master

update