Copy and formatting changes.
Merge pull request #2 from remixz/master

Copy and formatting changes