Samreay/ThesisZ — pull request #7 by Samreay (2014-04-25 07:18:27+00:00)
Title: Merging back to master.

Code relatively stable.