Merge pull request #8 from Cyruxx/master

To same state