Version 0.06

More testing..