Initial version
Merge remote-tracking branch 'Bamburi.2014/master'

Conflicts:
	README.md