Merge pull request #3 from Livaell/master

Merge pull request #2 from Livaell/Livaell