some changes
Merge pull request #40 from michaelhukun/master

pull