2nd commit
Merge pull request #1 from jacniq/master

2nd commit