Resolved issue #59
Resolved conflict
Updated README.md
Update README.md
Added version.txt (debugging)
Remove version.txt
Resolved issue #65
Merge branch 'master' into stable