Updated to try to include time (non-functional)
Merge branch 'master' of https://github.com/nachosgrande/Prototypes