Merge branch 'master' into jeff
first weeks dst
Merge pull request #55 from jtleek/jeff

dst