Fixed clean up at abort seg fault, Added check on token and id to ensure correctness, fixed issues with flags
Merge branch 'master' of github.com:Jarkore/Feednix