Fixed - #46, #48, #49