V0.8.1

Minor Code Refactoring.