Merge pull request #83 from lightsoda/master

#67: Some more look and feel work
Merge remote-tracking branch 'upstream/master'