wittenberg Merge branch 'master' of https://github.com/wittenberg/vlad into master