Random fixes
Merge pull request #40 from chylex/master

Random fixes