Develop

Preparing for next release. Minor features added. Some bug fixes.