Merge branch 'master' of github.com:Rewasvat/ouroboros