Merge pull request #4 from wilsto/master

last commit 9/5
Merge pull request #13 from CedDev/master

Merge pull request #4 from wilsto/master