Implementing version 1...
Merge pull request #6 from AntoniaR/master

Implementing version 1...