Please merge these changes into the master

I still have two commits to my master, 1. existing changes 2. compiled classes. If you don't think the compiled classes are needed, you can discard the compiled classes. Let me know if you have any trouble merging.