Merge pull request #9 from SchizoDuckie/angular

refresh my fork with the latest updates
fix single timer delete #194
Merge pull request #196 from garfield69/angular

fix single timer delete #194