Merge pull request #5 from RitwikGupta/master

Added universal run
Added modularity and else statement