more changes.
Merge pull request #1 from pikesley/branchalicious-ihatemyself

more changes.