API sheet, bug fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #337 from sturtus/master

API sheet, bug fixes