Merge commit '44a0bad' into merge-fix
Merge commit '4ad1fb8' into merge-fix

Conflicts:
	js/main.js
Merge branch 'master' into HEAD

Conflicts:
	js/main.js
Merge pull request #19 from danieltcv/merge-fix

Merge fix