Bug fixes;
Merge pull request #17 from DSVProject/master

Bug fixes;