Merge pull request #2 from seb86/master

Updating dev branch from master
Merge pull request #3 from seb86/dev

Merge pull request #2 from seb86/master