SPLASH 2013 updates
Merge pull request #73 from hbaragar/master

SPLASH 2013 updates