Merge pull request from jelitox/master