Merge pull request #1 from troglobit/master