Reformatted code according to google-cpp style guidelines.
Merge pull request #4 from zarianw/develop

All the changes look good. Going to merge it to master.