changes
Merge pull request #2 from HorusChan/master

changes