Merge pull request #21 from azakus/master

Spec Compliance