Initial fixes
Merge branch 'master' of github.com:gscoglio/yosemas