Refactoring things
Merge pull request #36 from smeggingsmegger/master

Refactoring things with autocomplete