spike into dns
later
cleaing
merge conflics
Merge pull request #2 from pietdaniel/piet-dev

Piet dev