Merge pull request #37 from keobrien08/frodo

merge to master
Merge pull request #4 from RobLoach/frodo

Merge pull request #37 from keobrien08/frodo