Closing issues #14 and #22