thirtysixthspan Merge pull request #50 from thirtysixthspan/fix-build