Improve Encoded word handling fix #55

This should fix most of what was reported in issue #55 by correctly handling multiple encoded-word's
Also changed/added test cases for this.