bug fix
Merge branch 'JDA' of github.com:utcoupe/coupe14 into JDA