starting to fix
Merge branch 'master' of https://github.com/vinicz/potential-octo-adventure
Ice laby optimalizations