Merge pull request #19 from dictyBase/master

Merging the commits from the master
Merge pull request #20 from dictyBase/develop

Merge pull request #19 from dictyBase/master