Merge pull request #104 from Useful-Innovation/johans-fixes

validation on new time/purchase