Version 1.2 - Implementing a timer + some bugfix