Merge pull request #38 from vltadrian/master

Partial Fixes #5