Resolves #196
Merge branch 'master' of https://github.com/CompEvol/beast2