Updates suggested by @pekrau and @remiolsen..
Fixes after testing the organism config thingy..
Merge pull request #11 from ewels/master

Updates suggested by @pekrau and @remiolsen..