fixed #1, fixed #3
0.1.4