bug fixes;
Merge pull request #6 from DSVProject/master

bug fixes;