Initial Commit

Bugfix short-circuit