Bumped veresion
Merge branch 'my'