Merge pull request #64 from lategoodbye/master

Fix decoding and 2nd address search