Dev opensource

merge code to master