Merge pull request #64 from uded/master

Bug fixes and 3rd party library updates