fix for some isses of #25
Merge branch 'issue25' into All-Time-Master