Fixed bug #62
Improve #61
Improvement #50