Updating documentation
Adding proposition and final flags
Merge pull request #69 from plaprade/master

Adding proposition and final flags