issue #61 done
Merge