Merge commit 'vudentz/master'