Issue 3

This PR resolve #22 
This should be removed