Fixed #2 and #4
Merge branch 'master' of https://github.com/villavanschaeck/vvsmpc

Conflicts:
	js/script.js