wip + merge
Merge branch 'master' of github.com:alfredkam/PHYLO