#139
Merge pull request #140 from dilgerma/master

#139