Merge pull request #272 from MG-RAST/master

Merging changes from master back to develop.