Merge pull request #228 from MG-RAST/master

Updating develop with master