bug fixing
Added support for if statement
Merge branch 'buggyprint'
removed unnecessary files