First commit
Merge https://github.com/jskogelin/castrophany