Merge branch 'hotfix-difftime'
Merge branch 'hotfix-0.3-2'
Merge branch 'hotfix-0.3-3'
Added Maintainer field and bumped version.
Merge branch 'hotfix-0.3-4' into develop