Making user setup a little easier.
Merge pull request #118 from toomuchpete/setup_additions

Making user setup a little easier.