Minor Changes
Refactored Code
Version 0.8.1