tweaks
removed sun sim masking
Merge branch 'master' into gh-pages