Merge pull request #228 from MG-RAST/master

Updating develop with master
Merge pull request #229 from MG-RAST/develop

Merge pull request #228 from MG-RAST/master