Fixed KVO
Cleanup
Merge pull request #1 from ffried/master

Fixed KVO, General Cleanup