Several updates to achieve version 1.1 (Working Progress)