Merging develop to master

Use the new Ruby 1.9 hash syntax.