Initial commit
Merge https://github.com/mdgagne/pimash