Initial setup, Step 1

This pull request contains Step 1, this concerns the issues #1, #13 and #12