fix #18, fix #13, pushed version to 0.3.5