Merge pull request #160 from mikeubell/master

Fix merge
Finish adding #150 data.