Fixed #31 (Issue number 1)