Merge pull request #1 from stagrlee/master

Some minor updates you might find useful