Bug fixes and improvements
Added .gitmodules