version catch-up
Merge pull request #339 from tgabi333/master

version catch-up