Merge branch 'master' of https://github.com/rouabhi/devicize

Conflicts:
	README.md

v0.02 option add + minor bugs
Merge remote-tracking branch 'origin/master'