Implementation of #4.
Merge pull request #5 from dhoechst/PBI1234

Implementation of #4.