Merge pull request #3 from timorl/master

Some simple setup changes; important constructor changes.