Few change for issue #16
Improvement for issue #17
Merge