fix diffing on mac systems
Fixed bug in the pull request
Merge branch 'cartazio-master'
Fixes issue #55 and #54