Merge pull request #26 from neraliu/devel

merge the devel branch to master
Merge pull request #27 from neraliu/devel

merge the devel branch to master
Merge remote-tracking branch 'origin/master' into devel