Merge pull request #19 from wschorn/thursday

Thursday
Merge pull request #22 from wschorn/bugged_version

Bugged version
changes