Merge pull request #15 from dariomanesku/master

Minor fixes.