Version 0.1.9, changes by @ThiefMaster #73, #76, #77.