Merge pull request #15 from xoppa/master

Various changes
Fix opacity