Merge pull request #1 from vogdb/issue-1

Initial code
Merge branch 'master' into issue-2