Merge pull request #12 from akbargumbira/master

Address some issues
Drop s from InaSAFEs.