Merge pull request #31 from jcchin/scitech

Scitech
Merge pull request #32 from jcchin/scitech

merge berton comments
more tweaks peppered throughout