Fix issue  #115
Fix a stupid bug

Only my version have this bug...
Up version to r514
Merge remote-tracking branch 'origin/master' into gh-pages