minor changes
merged with nikita's code
added many important files. few minor changes in existing code
few change
conflicts resolved