Temporary fixing
Merge pull request #106 from SompongSoftwareEnterprise/fix-bugs

Temporary fixing