Merge pull request #1 from CE-KMITL-CLOUD-2014/master

merge