1ddccc6 Merge pull request #53 from alrra/improvements