Merge lastest

This fixed the Issue #5 .