Merge pull request #19 from dictyBase/master

Merging the commits from the master