Merge pull request #1 from calcdude84se/master

Remerge