Now working on version 0.9.5