Formatting and compatibility modifications.
Merge pull request #2 from syb0rg/master

Formatting and compatibility modifications.