Initial commit
Merge https://github.com/nare469/chinchilla