Merge pull request #1292 from voltan/develop

Work on head meta