second commit
Merge pull request #1 from rysie/second

second commit