changes
Merge pull request #1 from hemorej/master

changes