initialization and fix up. Working version
Merge pull request #2 from mcharris/master

initialization and fix up. Working version