20-08-2013 update
Merge pull request #2 from flipmcf/3.1.6-20-08-2013

20-08-2013 update