Merge branch 'master' of https://github.com/jogloran/bawrista2

latest commit 2346e4c915
@jogloran authored