Merged pull requestion from nschloe, #48.