Add elements

Add sp:Optional support
Add sp:Union support
Merge pull request #1 from serwan/master

Add elements