updated loading for no normalization factor
merging upstream

Merge branch 'master' of https://github.com/steve-federowicz/om