Merge pull request #2 from seb86/master

Updating dev branch from master