Merge pull request #21 from timorl/master

First beta version