First Draft
Merge pull request #2 from nabelhm/First-draft

Added first draft (fix #1)