lots of commits
Merge pull request #100 from facoptere/1.8.1

lots of commits