Merge pull request #3 from ksoona/master to kaneda/knife

hell yes