close#116
Merge pull request #121 from rhsu/116UserPrefs

close#116
Merge branch 'master' into HTMLMockups