Push & Refactoring
Merge branch 'master' of github.com:Liechtathlet/citr