Inception
Merge pull request #251 from remear/overhaul

Inception