Adds test for advanced options and improves documentation
Merge pull request #87 from jeduan/master

Adds test for advanced options and improves documentation