script generates two warnings on compilation
Created attachment 2605 [details] [review] Proposed Patch
This has been pushed to master, please test