Merge pull request #97 from smsm1/tweaks