Merge pull request #20 from Disoft/master

update to luis-branch
Merge pull request #21 from Disoft/Luis-Branch

Merge pull request #20 from Disoft/master