Update to 1.2.18
Merge pull request #1 from jacobthemyth/master

Update to 1.2.18