Restore comments in files
updates from 1.34.161.1
add maginds and other changes
Merge pull request #4 from 0lvin/master

magnids support