Fixes #132 and "fixes" Phone glitch
Merge pull request #167 from jcotrel/master

Fixes #132 and "fixes" Phone glitch