Changed default elements
Merge pull request #286 from dswd/default-elements

Changed default elements