Merge branch 'dev' of github.com:Rewasvat/ouroboros into dev