partial merge of branch nichtich-master
add contrib.
bump version
0.006