better parsing

fixes #15
fixes #5
0.7.0