Done for today

next step is adjusting the registered system
Merge pull request #5 from UberLame/master

Done for today