some changes

some changes
Merge pull request #42 from michaelhukun/master

pull