Merge pull request #374 from srinivasupadhya/master

acceptance fixes