Merge pull request #24 from Southpaw018/southpaw018

Merging updates into master