New features added

Please pull my changes. Please don't merge this directly. I would test it on a separate installation first. I had no one else to test it besides myself. As far as I am concerned, it works very well.