Merge pull request #7 from Tucos/bug-640