Fixed a few things, clarified findFreespace method. Javadocs probably coming soon for that one.
Merge remote-tracking branch 'upstream/master'