Merge pull request #2 from audiodude/master

Merging audiodude's work
Some text updates