Merge pull request #18 from robert-scheck/vatno