Keepin' up to date

Made some changes, pull request so your fork is up to date.