Merge branch 'development'

Conflicts:
	README.md
Merge pull request #1 from muhammadghazali/master
Merge branch 'development'