Merge pull request #1 from Meneth/master

Various fixes
Reverting to last release