Merge pull request #1 from CakeTick/master

Update