initial commit
Merge https://github.com/josefzacek/gregoryfrancis