Merge pull request #8 from arxony/development

Merged conflicts.
Merge commit 'fb12b9420e31f6ce1c1ee05388cc97469cd57451' into development