Version update

bug fix and small enhancements