Merge @eltjpm minivect's patch
Patch for issue #303 (thanks to @eltjpm)
Merge branch 'devpatches' into devel