Changes made to version 0.9  to work on version 0.10