Merge pull request #14 from XaaK/master

Few updates