Merge pull request #139 from Edgars-Burtnieks/patch-1