Simplified parser
Fixed outline bug
Added missing license, added @Override