Merge pull request #425 from raistlinthewiz/develop

fixing the last pr.
Update README.md
Merge pull request #429 from raistlinthewiz/develop

misc fixes