Fixed bug in listing and added better debug output.
Merge branch 'test' into dev