Merging with branch feature/explicit

@asamake I think I have merged the important commits from feature/explicit into merging-with-explicit which was branched from develop. could you try this branch with your code ?

This pull request implements #387