Update,code functionality merged, minor bugfixes and enhancements.