changes for github
1
Merge pull request #1 from nromanen/Shaman

changes for github