some changes..
Merge pull request #32 from disufi/master

some changes..