Julian's feedback
Merge pull request #5 from ryanroberts1983/feature/mgamboa/2014-26-08/feedback

Julian's feedback