Yet survive
Merge pull request #35 from githubteacher/tlberglund

Merge this stuff