Fixed issue 35 on Google Code