Version 2.3.1, Solved issues #20 and #21