few changes
Merge pull request #80 from indykish/master

few changes