Fixed conflicts
Merge branch 'master' of https://github.com/saldarriaga/102_kerry