Major changes
Merge pull request #7 from leonardloo/master

Major changes