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

Pull bug fixes