Merging
Merge branch 'master' of https://github.com/techhatch/toky
Cleaned it up again