1.8.1 update
Merge pull request #88 from facoptere/1.8.1

1.8.1 update