Few tweaks
Merge pull request #1 from madebycomrades/matt/starter-for-10