Code

Merge pull request #22 from bostjan/master