Created by: Snawoot
Purpose of proposed changes
Fix #311 (closed) Fix #305 (closed)
Essential steps taken
autogen