Adds classes instead of functions
Merge branch 'master' of https://github.com/afilipov92/alex