Merge pull request #2 from SmilingDevil/master

Merge pull request #1 from SmilingDevil/development
Merge pull request #3 from SmilingDevil/development

Merge pull request #2 from SmilingDevil/master