Merge pull request #4 from Vixu/master

Some changes
Merge remote-tracking branch 'upstream/master'