Merge pull request #11 from David-B55/master

Merge updates