Moar CODeZ
Merging all the things
Merge pull request #135 from xeregin/hatest

Moar CODeZ