Issue 3

This PR resolve #3