Feature/4

pls merge for Issue #4.