Fixed issue #8 and updated several assets