Bjeki commit
Merge pull request #19 from Aristotel/master

:dog: :cat: bjeki