stage 2
merge
Merge branch 'master' of https://github.com/gene9/vsemoe