Added complex type support
Merge pull request #6 from carlsverre/master

Added complex type support