Bug fix.
Merge pull request #212 from Clashnia/various

Bug fix.