2nd commit
Merge pull request #13 from rpety/master

2nd commit