changed the package name
Fixing helpers to work in windows environment
Merge branch 'pr/16'