Fixed #22
Merge pull request #23 from tmas/master

Fixed #22
merge conflicts fixed