Updated all source code as per version 0.6b

Changes now being made to version 0.7b which will involve changing class
structure to a more efficient base.