Massive update :)
Merge pull request #1 from srizon/master

Massive update :)