Merge pull request #197 from LucentW/master