Merge pull request #1 from danweflen/master

Some minor tweaks