keypath addition
updated keypath
keypath code refactor
keypath minor edit
Merge pull request #21 from blehman/master

keypath code refactor