hand-made local changes
accept upstream
Merge branch 'master' of http://github.com/smikes/inchi
Merge branch 'master' of http://github.com/smikes/inchi
Merge branch 'master' of http://github.com/smikes/inchi
Merge branch 'master' of http://github.com/smikes/inchi