Final draft of the working copy
Merge pull request #2 from gkze/master

Works