Updates after short testing
Merge branch 'master' of github.com:Team-2823/C-Code-2014