Merge branch 'master' of https://github.com/michischatz/bmecat.git