UPDATED
* Minor bugfixes and performance improvements
