Merge changes
Merge pull request #26 from ryanroberts1983/feature/mgamboa/2014-10-04/merge

Merge changes