merge+ bugfix(some item was added twice)
Merge branch 'master' of https://github.com/Schachus/adventure-of-umalu into Schachus-master