Initial commit
Merge branch 'master' of github.com:lossantlos/ICT-test1 into win
merged master linux