merging with 0.3.16

these files were given to me unofficially, use at your own risk!