Basic changes
Merge branch 'master' of https://github.com/fvicaria/icecode.git