Merge pull request #14 from 31415us/master

should be ok :o)