Tok itr

Hi Rusty,
Here is another pull request with changes based on your suggestions. Ive sent an email to the list with an explanation.