First draft
Merge pull request #6 from jjarvi76/master

First draft