Merging ysorigin master

Resolves #211