Correction and style fixes
Merge pull request #2 from abooitt/improvements

Correction and style fixes