Gitnone/Timer — pull request #2 by Gitnone (2013-12-15 20:09:53+00:00)
Title: Applies neweste updates from master.

Getting neweste updates from master.