Merge pull request #9 from fi01/test

Added some devices and fix infinite loop