Update to current merged version with a few edits on my end.

Feel free to pull if you would like.

Cheers,
Loyal