#62 Added some tests, fixed some bugs.
#62 Finished tests.
Merge branch 'Issue0062'

Conflicts:
	.classpath