pravj Merge pull request #11 from cnu/master