Major refactoring
update
update
update
update
update
update
update
Updated Scala to 2.11.4