Merge pull request #76 from hbaragar/master

SPLASH 2013 updates
SPLASH 2013 updates