Merge pull request #511 from sawickiap/master

Added VMA_VERSION macro and other improvements