Initial import
Improved Scaladoc
Resolved conflict