fixing some stuffs
Merge pull request #1 from qadan/master

fixing some stuffs