Merge pull request #4 from zesk8/master

Showroom changes