first commit
fixed exception handling
removed target