Merge pull request #2 from wawiwa/develop

com1