Merge pull request #99 from Sriii/master

master to hasan
Mortise Galleries

all done
Merge pull request #101 from Sriii/Hasan's-branch

hasan to master