Merge pull request #272 from MG-RAST/master

Merging changes from master back to develop.
Merge pull request #273 from MG-RAST/develop

Merge pull request #272 from MG-RAST/master