fixed my name
Merge and fix conflicts for PR #56.