temporary fixing
Merge pull request #105 from SompongSoftwareEnterprise/fix-bugs

temporary fixing