Merge pull request #12 from Linedwell/master

Merge
Merge pull request #13 from Linedwell/develop

Merge pull request #12 from Linedwell/master