fixes in diff
identation fixes
bug fixes + release 0.4.1
Merge branch 'develop'

Release 0.4.1:

- Bug fixes (in diff and PyPI setup).