Resolve #51

( Need to do some small changes )