Linked to system

Fix #21