corrected linking, improved code style
--> if / --> basics
merging resolved