Merge pull request #717 from srinivasupadhya/master

#707 - fixing build