timer added
Merge branch 'master' of https://github.com/timgshi/ShadowWarhol