Merge branch 'hotfix'
Merge branch 'hotfix': v0.5.4, Fixes bug #35
Fixes #38
Adds CSS for datepicker