Fixed parsing for analyze targets
Merge pull request #327 from donaldkwong/master

Fixed parsing for analyze targets