Added updated program

Added fix for Bug #2
Added && to features