Simplified interface by removing dependency on IOException.
Merge remote-tracking branch 'origin/master'