Version 5.5.0.2

Minor bug fixes and enhancements