Github/master

Merge of github/master branch