fix for bug #86
Merge branch 'raymond' of github.com:lolitseasy/vdiamond into raymond