Patch added. To be tested
Patch released
Merge branch 'fix'