Poc/0.6

merge poc/0.6 to master