Initial code
Merge branch 'dev' of https://github.com/tromik/Code into dev