Merge pull request #260 from menny/master

Lots of fixes and additions for v116