Fixed issue #9. Other updates that I can't remember and don't have time to look up right now :-(.