readme change
added watch for package json.. some refactoring
small changes
fix merge issue