some changes
Merge pull request #35 from tdoshi/master

some changes