Merged pull request #83 - resolved confilcts