Added more test coverage, fixed bug relating to externally defined component options.
Merge pull request #6 from lasso/master

Added more test coverage, fixed bug relating to externally defined componet options