0.6.1
sync OASIS to 0.6.1