Fix the Issues #43#49

linsir wants to merge 2 commits intobdarnell:masterbdarnell/torndb:masterfrom

linsir:masterlinsir/torndb:masterCopy head branch name to clipboard