Update
Update
Added features
Little fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Merge pull request #17 from P4V4/master

Added features