<bugfix/timeline> fix double add timeline entry #140
<stable/0.1> Merge branch 'bugfix/timeline' into stable/0.1