Fixing wrapping stuff
Merge branch 'master' of github.com:sauyon/pamatkd