Merge pull request #18 from ZooTypers/master

update
fixed merge problems
Merge pull request #106 from cdallas/master

fix