Initial commit, source from ntakimura bitbucket
Fixed conflict and changed readme
Conflicts:
	README.md