sw-yx Merge pull request #37 from gezquinndesign/patch-1