By Adam

Bug fixing took longer than expected.