Adding new devices and defaultvalue for deviceinfo
Same codingstyle as author
Correcting devicenr
Updated readme
Merge branch 'j/master'