Changes for making Sui easier
Merge pull request #134 from cortiz/master

Changes for making Sui easier