added if stmts for obj1 merge
updated build time
Merge pull request #16 from ljwolford/testbranch

added if stmts for obj1 merge