fixed bugs
Merge pull request #5 from cvsolutions/master

fixed bugs