second commit
Merge pull request #1 from lsp411/master

second commit