jshint ftw!
added a param
Merge branch 'feature/perliminary_v0_3' into develop