Fixed parser problems described in issues #3, #4 and #5