Updated to use 1.1.9-snapshot
add pr1 - merge conflicts