Preliminary work.
Merge pull request #2 from ttvd/master

Preliminary work.