Merge pull request #2 from sonOfRa/master

Merge current progress