Condition Additions

Certain conditions must be set.
Merge pull request #254 from Kiroshima/master

Condition Additions