Merge pull request #170 from shole/master