commited by amit. references #1