fixes tracker issue #52
adds tracker feature #67