Refs #52 Bug Removed
Refs #53 Bug Removed