Update for Bug Fixes

Version 1.0 Build 2