Dev0.9.7

Version 0.9.7 Dev (see changelog.txt for more info)