Merged pull requestion from nschloe, #48.
Merge branch 'master' into sub_doc