Merge pull request #3 from tas50/master

More tweaks

thanks @tas50!