Merge pull request #6 from Tamschi/master

Some issues and a property