changes
Merge pull request #1 from spmike95/master

changes