Merge pull request #12 from andyhull/master

Fixing some errors
Merge pull request #13 from andyhull/master

Updating develop to match master
adding text update
Merge pull request #14 from andyhull/develop

Adding develop changes