Current Version: 0.01

Merged master and branch for stable release