Merge pull request #4 from Daikatana/development

Development