Merge pull request #14 from wikipathways/master

updating from master
Merge pull request #15 from khanspers/master

Merge pull request #14 from wikipathways/master