Merge branch 'haroldl-master'

Conflicts:
	lib/serialization_helper.rb

Closes #37