Squashed 'core/' changes from 1b0a891..99ab516

99ab516 Merge pull request #5 from dylanreid/feature2
c58e698 -n 2
b3359c1 Merge pull request #4 from dylanreid/feature1
1eb717e -n 1

git-subtree-dir: core
git-subtree-split: 99ab516c5ef2e721822522bc25c852cd6ae53ef4
2