Updated style-guide and some tweaks from testing.
Merge pull request #3 from weecorp/master

Updated style-guide and some tweaks from testing.