Merge pull request #9 from JMtorii/master

Merging
Merge pull request #10 from JMtorii/test

Merge pull request #9 from JMtorii/master
Merge remote-tracking branch 'upstream/master'
Added in workstation shortcut, discomfort views