Merge pull request #621 from ByteHamster/return-guid