moved code over to gotako
Merge pull request #1 from bradleypeabody/master

moved code over to gotako