No jquery - fix #132

#132 

Do not merge this, atm it's only to share the work done as it's beeing commited.