AM-511 initial
AM-511 more testing
AM-511 more debug output; removed float-check (copy&paste error)
AM-511 more debug output
AM-511
AM-511
Merge branch 'master' of ../Diamond/