init
Merge https://github.com/donmatthew/mattiasbackstrom