Merge pull request #128 from kengruven/master
authorDavid Vázquez <davazp@gmail.com>
Tue, 18 Jun 2013 23:26:37 +0000 (16:26 -0700)
committerDavid Vázquez <davazp@gmail.com>
Tue, 18 Jun 2013 23:26:37 +0000 (16:26 -0700)
Various functions and minor bug fixes


Trivial merge