added some docstrings
Merge branch 'master' into feature_maps