Merge pull request #9 from wikipathways/master

latest from wp master
Merge pull request #120 from khanspers/master

Merge pull request #9 from wikipathways/master