Merge pull request #28 from jcrom/master

fixed som buges.