Merge pull request #71 from advanpix/master