Merge pull request #16 from thnkloud9/master

fix my merge issues, and add init options param
Merge branch 'master' of github.com:thnkloud9/theme-StoryTeller