typo fix
fixed bug, added timer
Merge pull request #19 from sararubin/timer

Timer