SVN r60
Merge pull request #1 from mchyla/master

SVN r60