Update 1.5 - Fix bugs, build solution & improve parser