Peter Smith - 2012-04-21

Thanks very much for the bug report and fixes. Will include in the next release.