Bug fixes
Merge pull request #107 from SompongSoftwareEnterprise/fix-bugs

Bug fixes