Initial commit
Bug fixes. code refactoring
Bug fixes. code refactoring