Minor changes
Added static analysis