New version (still with problems on less compilation)
Included wrongly ignored files thanks to @matschaffer :)