merge
merge
test
update parameter warnings
Merge pull request #89 from marsmith/master

update parameter warnings