Merge remote-tracking branch 'fjoncourt/master'
authorMichael Rash <mbr@cipherdyne.org>
Thu, 16 May 2013 01:31:17 +0000 (21:31 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Thu, 16 May 2013 01:31:17 +0000 (21:31 -0400)
Closes issues #76 and #60.


Trivial merge