build
some refactoring
Merge branch 'master' of https://github.com/jcono/timeline
some small refactorings
Merge branch 'master' of https://github.com/jcono/timeline