Merge pull request #104 from mjohnson541/master

analysis
fixes