Merge pull request #267 from n3ph/master