added another nosetest
Merge remote-tracking branch 'origin/master'

merged conflicts