Merge pull request #28 from cloudedge/pull-req-master-d5070acd86c8ba863774a27e016b5327e7e0e41e

Merged by devtool for aabes