Work on #52
PKG and version