Condition 1.1.1
Merge pull request #1708 from nathggns/conditionjs

Add Condition 1.1.1