Reordered statements.
Updates for the latest Android Studio 0.5.7
Fixed bug where the timer was started before the class was fully initialised.