Major update
Merge pull request #3 from Yepoleb/master

Major update