possible fix for #13
adjusting for DST
adding a version and fixing various bugs
Merge branch 'master' into gh-pages