Fixed return values. Fixed #2.