Merge pull request #314 from s0undt3ch/develop

Switch to date based version
Merge pull request #317 from s0undt3ch/develop

Bug fix
Bump version