Commit_20140429

Added a line for the pinOrCombBC parameter and changed an if statement.