Added more raw settings support and unit test
0.1.7