Merge pull request #120 from def-/master
authorJoel Martin <github@martintribe.org>
Mon, 23 Nov 2015 19:32:29 +0000 (14:32 -0500)
committerJoel Martin <github@martintribe.org>
Mon, 23 Nov 2015 19:32:29 +0000 (14:32 -0500)
Nim fixes


Trivial merge