2.0.5 Release

Bug fixes, code cleanup and some minor feature enhancements.