Merge pull request #1 from seven1m/master

Random fixes.