Versioning scheme of things
Comment out something and change something else
Merge pull request #123 from wiredearp/master

Versioning scheme of things
Merge remote-tracking branch 'upstream/master'