First commit
Merge https://github.com/adoyle2014/jottly