Fix safeName issue #5
Merge origin/master