changes
Merge pull request #1 from jaei/master

changes