Squashed 'core/' changes from 0b1b293..4eba548

4eba548 Merge pull request #8 from dylanreid/feature4
0b8b724 -n 4

git-subtree-dir: core
git-subtree-split: 4eba5489d69c9c0ba7f5f044cd168428fb23989f
Merge commit 'd3526d1fcc78e74318b7e03888f4d07a7d87bfcd'