commit
Merge pull request #1 from palanza/master

merge