added todos
improved url parsing
Merge branch 'dev' into min
merged dev
minified