Update!
Merge pull request #1 from kishkaru/master

Here are the updates