Merge pull request #1 from seb86/master

Just updating the dev branch to version 1.0.2