Apply coding style changes as per tickets #87 and #159.
Merge branch 'release-2.0.0' of github.com:Secretchronicles/SMC into release-2.0.0