Merge pull request #123 from lnalex/master