Version 0.4.7

Improved code structure.