Updates
Merge branch 'master' of https://github.com/jlv-code/at.unearte2014