Merge pull request #14 from KellyBlack/dev

Dev
Merge remote-tracking branch 'origin/dev' into candace_dev