Merge pull request #2 from lvpengable/master

Merge pull request #1 from lvpengable/1