Merge pull request #5 from fi01/test

Support new devices