pull head

Merge pull request #2 from noldmess/master