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

bug fixes;