0.6.1

+Slight refactoring
+Renamed some function for clarity.
+Debug values