Initial Release

Minor bugs and coding style issues fixed