Merge pull request #17 from cloudedge/pull-req-master-8fd3f586f8e29b7bf0af886ccc15be0e9c3290e1

Merged by devtool for cloudedge