Fixes

Configuration strings fix, add comments.
Rename function
Merge pull request #9 from rampage644/fix

Fix