Simplify
Merge pull request #193 from korczis/master-clean

Simplify