Merge branch 'master' of https://github.com/dopefishh/ker2014-2