Honestly can't remember what changes I've made
Merge branch 'master' of github.com:greytoyota/caltaiko

Don't really know what happened here, but Ima try to fix it