Fix #58, simple parser