Resolving issues #20 and #23