made changes to add third argument functionality
Merge branch 'third-argument' into gh-pages