Simplify
Merge pull request #27 from Arcovion/PR

Simplify