autism commit
Merge pull request #24 from zined/zined_autism

sorry for my autism :)