formatting and README changes
Merge pull request #1 from xcore/master

Pull master