Final fixes
Merge branch 'master' of github.com:trevorassaf/mineral
Join