Merge pull request #1 from phawk/dev

Bugfix with replace
Add contributing section