Fixed #22
Version 0.5.4