Commit ab01715e47d0e888799a48266b8c7b9ac8bb3c9e

kanoi 2014-07-04T08:36:48

Merge pull request #6 from jameshilliard/rk merge upstream frequency changes