fix issue #75
add link to original
fix issue #74
fix issue #51
fix issue #61
merge dev