Added app packaging
Fixed timer