fixed Issue #19
merge with master