Merge pull request #6 from giuseppe/master
authorMatthew Endsley <mendsley@gmail.com>
Thu, 26 Mar 2015 16:42:25 +0000 (09:42 -0700)
committerMatthew Endsley <mendsley@gmail.com>
Thu, 26 Mar 2015 16:42:25 +0000 (09:42 -0700)

Trivial merge