minor (remove duplicate code). #262
Merge remote-tracking branch 'arskom/master'