Merge pull request #12 from Linedwell/master

Merge