6 was apparently too harsh.
Merge pull request #174 from Clashnia/various

6 was apparently too harsh.