Merge pull request #1 from benorama/master

Upgrade to 2.3.6 + metaAttribute methods fix
version change