conform to RFC
Merge pull request #3 from andreif/master

conform to RFC