update 2

update 2
Merge pull request #17 from viniman26/master

update 2