Hopefully fixed issues with time
Merge branch 'hotfix/0.3.2'