Merge pull request #305 from chris18890/dev

Reviewed. EMERGENCY FIX FOR #304