Merge pull request #1 from fi01/test

Added some addresses and fix infinite loop