resolved conflict
Fixed diff vestiges
Merge pull request #3 from pbattaglia/F-kevinwrapper

F kevinwrapper