Merge pull request #5 from Vixu/master

Additional people