Closed issues #28 & #31