Added modularity and else statement
Merge pull request #6 from RitwikGupta/master

Added modularity and else statement