fix issue  #225
Merge pull request #240 from tibel/metro

fix issue  #225