Issue/63

Fix #63 , #62