The fix for WSI-70 was causing issues so I've removed it.
Merge pull request #70 from narkiss333/development

The fix for WSI-70 was causing issues so I've removed it.