Updated setting of defaults in constructor
Merge pull request #11 from gheggie/master

Updated setting of defaults in constructor