Added options for monogamy and parameter changing
Merge branch 'master' into gh-pages