Merge pull request #2 from ivuk/master

Some more fixes