Merge pull request #1 from cybrown/master

Add by hunks