Revert "Issue 36"
Merge pull request #40 from pioneerit/revert-39-issue_36

Revert "Issue 36"