Merge branch 'master' of https://github.com/maxandron/RAYXam
Hope I didn't break something -.-