Merge pull request #2 from SebiH/master

Basic integration of tabs, drawinglibraryinterface and options
Merge remote-tracking branch 'upstream/master'