Today
merge from smallspiketrap_fixes